From ff4f641512e8ff5d47b1d38449a543e256996249 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 6 Nov 2001 15:14:09 +0000 Subject: [PATCH] Fix misplaced HAVE_XFT. Tue Nov 6 10:13:16 2001 Owen Taylor * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT. --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gdk/x11/gdkgc-x11.c | 2 +- 8 files changed, 29 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index da794962ec..83721f0ab4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Nov 6 10:13:16 2001 Owen Taylor + + * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT. + 2001-11-05 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_paint): expose the child diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index da794962ec..83721f0ab4 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +Tue Nov 6 10:13:16 2001 Owen Taylor + + * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT. + 2001-11-05 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_paint): expose the child diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index da794962ec..83721f0ab4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Tue Nov 6 10:13:16 2001 Owen Taylor + + * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT. + 2001-11-05 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_paint): expose the child diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index da794962ec..83721f0ab4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Tue Nov 6 10:13:16 2001 Owen Taylor + + * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT. + 2001-11-05 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_paint): expose the child diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index da794962ec..83721f0ab4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Tue Nov 6 10:13:16 2001 Owen Taylor + + * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT. + 2001-11-05 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_paint): expose the child diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index da794962ec..83721f0ab4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Tue Nov 6 10:13:16 2001 Owen Taylor + + * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT. + 2001-11-05 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_paint): expose the child diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index da794962ec..83721f0ab4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Tue Nov 6 10:13:16 2001 Owen Taylor + + * gdk/x11/gdkgc-x11.c: Fix misplaced HAVE_XFT. + 2001-11-05 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_paint): expose the child diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c index f6c4da625c..7412eb726a 100644 --- a/gdk/x11/gdkgc-x11.c +++ b/gdk/x11/gdkgc-x11.c @@ -754,6 +754,7 @@ gdk_x11_gc_get_xgc (GdkGC *gc) return gc_x11->xgc; } +#ifdef HAVE_XFT /* Various bits of the below are roughly cribbed from XFree86 * lib/Xft/xftdraw.c, Copyright 2000, Keith Packard */ @@ -781,7 +782,6 @@ foreground_format (GdkGC *gc) 0); } -#ifdef HAVE_XFT /** * _gdk_x11_gc_get_fg_picture: * @gc: a #GdkGC -- 2.30.2